Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 22 Oct 2011 05:54:01 +0000 (22:54 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 22 Oct 2011 05:54:01 +0000 (22:54 -0700)
commit62e6411915283acb3ff0a314a9b9f3b62ab23c36
tree687bc73c06308b8d601fa8d94468b874e48f4c5e
parent1b39fb163606e114709b9c6b433b1a2d24fb6c01
parenta9b8c3c43b507f27f345e1c3bb1f1898264e219b
Merge from trunk.